diff -rNu fvwm95-2.0.43f.orig/Makefile.in fvwm95-2.0.43f/Makefile.in
--- fvwm95-2.0.43f.orig/Makefile.in	2014-04-12 15:07:09.112195143 +0200
+++ fvwm95-2.0.43f/Makefile.in	2014-04-17 00:40:54.162217744 +0200
@@ -8,7 +8,7 @@
 
 @SET_MAKE@
 
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 subdirs=libs fvwm modules utils sample.fvwmrc xpmroot pixmaps mini-icons docs
 
diff -rNu fvwm95-2.0.43f.orig/configure fvwm95-2.0.43f/configure
--- fvwm95-2.0.43f.orig/configure	2014-04-12 15:07:09.113195104 +0200
+++ fvwm95-2.0.43f/configure	2014-04-16 23:56:01.175178249 +0200
@@ -527,7 +527,6 @@
 
 
 
-CFLAGS=-O
 
 #-------------------------------------------------------------------
 #
diff -rNu fvwm95-2.0.43f.orig/docs/Makefile.in fvwm95-2.0.43f/docs/Makefile.in
--- fvwm95-2.0.43f.orig/docs/Makefile.in	2014-04-12 15:07:09.113195104 +0200
+++ fvwm95-2.0.43f/docs/Makefile.in	2014-04-17 00:40:54.189217744 +0200
@@ -1,9 +1,9 @@
 
 SHELL=/bin/sh
 
-prefix=@prefix@
-indexdir=@prefix@/lib/X11/fvwm95
-htmldir=@prefix@/lib/X11/fvwm95/html
+prefix=${DESTDIR}/@prefix@
+indexdir=${DESTDIR}/@libdir@/X11/fvwm95
+htmldir=${DESTDIR}/@libdir@/X11/fvwm95/html
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff -rNu fvwm95-2.0.43f.orig/fvwm/Makefile.in fvwm95-2.0.43f/fvwm/Makefile.in
--- fvwm95-2.0.43f.orig/fvwm/Makefile.in	2014-04-12 15:07:09.115195025 +0200
+++ fvwm95-2.0.43f/fvwm/Makefile.in	2014-04-17 00:40:54.200217744 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/libs/Makefile.in fvwm95-2.0.43f/libs/Makefile.in
--- fvwm95-2.0.43f.orig/libs/Makefile.in	2014-04-12 15:07:09.385184347 +0200
+++ fvwm95-2.0.43f/libs/Makefile.in	2014-04-17 01:10:38.696243915 +0200
@@ -5,9 +5,9 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
-lib_dir=@exec_prefix@/lib
+lib_dir=${DESTDIR}/@libdir@
 x_includes=@x_includes@
 x_libraries=@x_libraries@
 fvwm_icons=@fvwm_icons@
diff -rNu fvwm95-2.0.43f.orig/mini-icons/Makefile.in fvwm95-2.0.43f/mini-icons/Makefile.in
--- fvwm95-2.0.43f.orig/mini-icons/Makefile.in	2014-04-12 15:07:09.448181852 +0200
+++ fvwm95-2.0.43f/mini-icons/Makefile.in	2014-04-17 00:40:54.256217745 +0200
@@ -1,8 +1,8 @@
 
 SHELL=/bin/sh
 
-prefix=@prefix@
-icon_dir=@prefix@/lib/X11/mini-icons
+prefix=${DESTDIR}/@prefix@
+icon_dir=${DESTDIR}/@libdir@/X11/mini-icons
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in	2014-04-12 15:07:09.508179479 +0200
+++ fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in	2014-04-17 00:40:54.271217745 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 #
 # Libs
 X_LIBRARY=-lX11 @LIBS@
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in	2014-04-12 15:07:09.508179479 +0200
+++ fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in	2014-04-17 00:40:54.286217746 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in	2014-04-12 15:07:09.509179439 +0200
+++ fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in	2014-04-17 00:40:54.304217746 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in	2014-04-12 15:07:09.509179439 +0200
+++ fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in	2014-04-17 01:10:58.633244208 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,7 +15,7 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=${prefix}/lib/X11/${fvwm_name}
+fvwm_dir=${DESTDIR}/@libdir@/X11/${fvwm_name}
 man_dir=${prefix}/man/man1
 
 #
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in	2014-04-12 15:07:09.510179400 +0200
+++ fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in	2014-04-17 00:40:54.338217746 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in	2014-04-12 15:07:09.511179360 +0200
+++ fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in	2014-04-17 00:40:54.352217747 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in	2014-04-12 15:07:09.512179321 +0200
+++ fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in	2014-04-17 00:40:54.367217747 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in	2014-04-12 15:07:09.512179321 +0200
+++ fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in	2014-04-17 00:40:54.380217747 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in fvwm95-2.0.43f/modules/FvwmForm/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in	2014-04-12 15:07:09.655173666 +0200
+++ fvwm95-2.0.43f/modules/FvwmForm/Makefile.in	2014-04-17 00:40:54.392217747 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in	2014-04-12 15:07:09.656173625 +0200
+++ fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in	2014-04-17 00:40:54.409217747 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c
--- fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c	2014-04-12 15:07:09.657173585 +0200
+++ fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c	2014-04-12 15:52:32.429033840 +0200
@@ -320,11 +320,11 @@
      int id = manager;                                             \
      if (id == -1) {                                               \
        for (id = 0; id < globals.num_managers; id++) {             \
-	 globals.managers[id].##field = value;                     \
+	 globals.managers[id]. field = value;                      \
        }                                                           \
      }                                                             \
      else if (id < globals.num_managers) {                         \
-       globals.managers[id].##field = value;                       \
+       globals.managers[id]. field = value;                        \
      }                                                             \
      else {                                                        \
        ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in	2014-04-12 15:07:09.658173545 +0200
+++ fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in	2014-04-17 00:40:54.436217748 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in	2014-04-12 15:07:09.659173505 +0200
+++ fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in	2014-04-17 00:40:54.451217748 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in fvwm95-2.0.43f/modules/FvwmM4/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in	2014-04-12 15:07:09.659173505 +0200
+++ fvwm95-2.0.43f/modules/FvwmM4/Makefile.in	2014-04-17 00:40:54.465217748 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 PATH_DEFINES = -DFVWMDIR=\"${fvwm_dir}\"
 EXTRA_DEFINES=${PATH_DEFINES} -DXPM -DSHAPE
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in fvwm95-2.0.43f/modules/FvwmPager/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in	2014-04-12 15:07:09.659173505 +0200
+++ fvwm95-2.0.43f/modules/FvwmPager/Makefile.in	2014-04-17 00:40:54.479217749 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in fvwm95-2.0.43f/modules/FvwmSave/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in	2014-04-12 15:07:09.660173466 +0200
+++ fvwm95-2.0.43f/modules/FvwmSave/Makefile.in	2014-04-17 00:40:54.491217749 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in	2014-04-12 15:07:09.660173466 +0200
+++ fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in	2014-04-17 00:40:54.507217749 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in	2014-04-12 15:07:09.661173427 +0200
+++ fvwm95-2.0.43f/modules/FvwmScript/Makefile.in	2014-04-17 00:40:54.522217749 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in	2014-04-12 15:07:09.662173387 +0200
+++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in	2014-04-17 00:40:54.540217749 +0200
@@ -1,8 +1,8 @@
 
 SHELL=/bin/sh
 
-prefix=@prefix@
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
+prefix=${DESTDIR}/@prefix@
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
 
 
 INSTALL = @INSTALL@
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in	2014-04-12 15:07:09.663173347 +0200
+++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in	2014-04-17 00:40:54.556217750 +0200
@@ -1,8 +1,8 @@
 
 SHELL=/bin/sh
 
-prefix=@prefix@
-icon_dir=@prefix@/lib/X11/icons
+prefix=${DESTDIR}/@prefix@
+icon_dir=${DESTDIR}/@libdir@/X11/icons
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in	2014-04-12 15:07:09.665173268 +0200
+++ fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in	2014-04-17 00:40:54.569217750 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 lib_dir=@exec_prefix@/lib
 x_includes=@x_includes@
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in	2014-04-12 15:07:09.667173189 +0200
+++ fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in	2014-04-17 00:40:54.579217750 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in	2014-04-12 15:07:09.667173189 +0200
+++ fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in	2014-04-17 00:40:54.591217750 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c
--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c	2014-04-12 15:07:09.667173189 +0200
+++ fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c	2014-04-12 15:59:36.189492766 +0200
@@ -229,7 +229,7 @@
 #endif
 
 	mif = NULL;
-	(void *) mif = calloc(1, sizeof(BatStatInfo_t));
+	mif = (BatStatInfo_t *)calloc(1, sizeof(BatStatInfo_t));
 	if(mif == NULL) {
 	  perror("FvwmTaskBar. BatStatModule.Init()");
 	  return NULL;
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in	2014-04-12 15:07:09.669173110 +0200
+++ fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in	2014-04-17 00:40:54.602217750 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
@@ -99,19 +99,19 @@
 modules: ${MODULES}
 
 CheckLockModule.so: CheckLockModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} -shared CheckLockModule.c -o CheckLockModule.so
+	${CC} ${CFLAGS} ${INCLUDES} -shared CheckLockModule.c -o CheckLockModule.so
 
 GoodyModule.so: GoodyModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} -shared GoodyModule.c -o GoodyModule.so
+	${CC} ${CFLAGS} ${INCLUDES} -shared GoodyModule.c -o GoodyModule.so
 
 ShowDateModule.so: ShowDateModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} -shared ShowDateModule.c -o ShowDateModule.so
+	${CC} ${CFLAGS} ${INCLUDES} -shared ShowDateModule.c -o ShowDateModule.so
 
 MailCheckModule.so: MailCheckModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} -shared MailCheckModule.c -o MailCheckModule.so
+	${CC} ${CFLAGS} ${INCLUDES} -shared MailCheckModule.c -o MailCheckModule.so
 
 BatStatModule.so: BatStatModule.c GoodyLoadable.h
-		  ${CC} ${INCLUDES} -shared BatStatModule.c -o BatStatModule.so
+	${CC} ${CFLAGS} ${INCLUDES} -shared BatStatModule.c -o BatStatModule.so
 
 ${PROG}: ${OBJS}
-	${CC} -o ${PROG} ${OBJS} ${LIBS}
+	${CC} ${CFLAGS} -o ${PROG} ${OBJS} ${LIBS}
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.save fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.save
--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.save	2014-04-12 15:07:09.669173110 +0200
+++ fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.save	1970-01-01 01:00:00.000000000 +0100
@@ -1,118 +0,0 @@
-#
-SHELL=/bin/sh
-
-@SET_MAKE@
-
-top_srcdir=@top_srcdir@
-srcdir=@srcdir@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bin_dir=@exec_prefix@/bin
-x_includes=@x_includes@
-x_libraries=@x_libraries@
-fvwm_icons=@fvwm_icons@
-fvwm_rc=@fvwm_rc@
-fvwm_name=@fvwm_name@
-#
-# This is where the modules will be installed
-#fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-fvwm_dir=@libdir@
-
-#
-# Dynamic loading options - uncomment for your platform
-#
-# solaris
-DL_CFLAGS = -fPIC
-DL_LFLAGS = -r
-DL_LIBS = -ldl
-# linux
-#DL_CFLAGS = -rdynamic
-#DL_LFLAGS = -rdynamic -shared
-#DL_LIBS = -ldl
-
-#
-# Libs
-X_LIBRARY=-lX11 @LIBS@
-XPM_LIBRARY=-lXpm
-XEXT_LIBRARY=-lXext
-FVWM_LIBRARY=-l${fvwm_name}
-LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${DL_LIBS}
-
-EXTRA_DEFINES=-DXPM -DSHAPE -DFVWM_ICONDIR=\"${fvwm_icons}\" -DPLUGINS=\"${fvwm_dir}/plugins\"
-CC=@CC@
-LD.so=@CC@ ${DL_LFLAGS}
-INCLUDES=-I${top_srcdir}/include ${x_includes}
-CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES}
-MAKEDEPEND=@MAKEDEPEND@
-INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-RM=@RM@
-
-PROG=FvwmTaskBar
-
-SRCS=FvwmTaskBar.c \
-	List.c \
-	ButtonArray.c \
-	Mallocs.c \
-	Colors.c \
-	Goodies.c \
-	Start.c \
-	GoodyLoadable.c
-
-OBJS=FvwmTaskBar.o \
-	List.o \
-	ButtonArray.o \
-	Mallocs.o \
-	Colors.o \
-	Goodies.o \
-	Start.o \
-	GoodyLoadable.o
-
-MODULES_SRC=CheckLockModule.c \
-	GoodyModule.c \
-	ShowDateModule.c \
-	MailCheckModule.c
-
-MODULES=CheckLockModule.so \
-	GoodyModule.so \
-	ShowDateModule.so \
-	MailCheckModule.so
-
-
-all: ${PROG} modules
-
-depend:
-	${MAKEDEPEND} ${CFLAGS} ${SRCS}
-
-install: all
-	${INSTALL_PROGRAM} ${PROG} ${fvwm_dir}
-	for f in `/bin/ls *.so` ; do \
-		${INSTALL_PROGRAM} $$f ${fvwm_dir}/plugins ;\
-	done
-
-clean:
-	${RM} ${PROG} ${OBJS} *~ core *.bak *.so
-
-distclean: clean
-
-modules: ${MODULES}
-#	cat INSTALL
-
-CheckLockModule.so: CheckLockModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} ${DL_CFLAGS} -c CheckLockModule.c
-	${LD.so} -o CheckLockModule.so CheckLockModule.o
-
-GoodyModule.so: GoodyModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} ${DL_CFLAGS} -c GoodyModule.c
-	${LD.so} -o GoodyModule.so GoodyModule.o
-
-ShowDateModule.so: ShowDateModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} ${DL_CFLAGS} -c ShowDateModule.c
-	${LD.so} -o ShowDateModule.so ShowDateModule.o
-
-MailCheckModule.so: MailCheckModule.c GoodyLoadable.h
-	${CC} ${INCLUDES} ${DL_CFLAGS} -c MailCheckModule.c
-	${LD.so} -o MailCheckModule.so MailCheckModule.o
-
-${PROG}: ${OBJS}
-	${CC} -o ${PROG} ${OBJS} ${LIBS}
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in	2014-04-12 15:07:09.671173031 +0200
+++ fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in	2014-04-17 00:40:54.617217751 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in
--- fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in	2014-04-12 15:07:09.673172952 +0200
+++ fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in	2014-04-17 00:40:54.631217751 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
@@ -15,8 +15,8 @@
 fvwm_name=@fvwm_name@
 #
 # This is where the modules will be installed
-fvwm_dir=@prefix@/lib/X11/@fvwm_name@
-man_dir=@prefix@/man/man1
+fvwm_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 #
 # Libs
diff -rNu fvwm95-2.0.43f.orig/modules/Makefile.in fvwm95-2.0.43f/modules/Makefile.in
--- fvwm95-2.0.43f.orig/modules/Makefile.in	2014-04-12 15:07:09.673172952 +0200
+++ fvwm95-2.0.43f/modules/Makefile.in	2014-04-17 00:40:54.646217751 +0200
@@ -3,13 +3,13 @@
 
 @SET_MAKE@
 
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 subdirs=FvwmAudio FvwmAuto FvwmBacker FvwmBanner FvwmButtons FvwmConsole \
 	FvwmCpp FvwmDebug FvwmForm FvwmIconBox FvwmIconMan FvwmIdent FvwmM4 \
 	FvwmPager FvwmSave FvwmSaveDesk FvwmScript FvwmScroll FvwmTalk \
 	FvwmTaskBar FvwmWinList FvwmWharf
-modules_dir=@prefix@/lib/X11/@fvwm_name@
+modules_dir=${DESTDIR}/@libdir@/X11/@fvwm_name@
 
 all:
 	@for i in ${subdirs}; do \
diff -rNu fvwm95-2.0.43f.orig/pixmaps/Makefile.in fvwm95-2.0.43f/pixmaps/Makefile.in
--- fvwm95-2.0.43f.orig/pixmaps/Makefile.in	2014-04-12 15:07:09.674172912 +0200
+++ fvwm95-2.0.43f/pixmaps/Makefile.in	2014-04-17 00:40:54.662217751 +0200
@@ -1,8 +1,8 @@
 
 SHELL=/bin/sh
 
-prefix=@prefix@
-pixmaps_dir=@prefix@/lib/X11/pixmaps
+prefix=${DESTDIR}/@prefix@
+pixmaps_dir=${DESTDIR}/@libdir@/X11/pixmaps
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff -rNu fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in fvwm95-2.0.43f/sample.fvwmrc/Makefile.in
--- fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in	2014-04-12 15:07:09.692172200 +0200
+++ fvwm95-2.0.43f/sample.fvwmrc/Makefile.in	2014-04-17 01:01:51.444236183 +0200
@@ -5,12 +5,12 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 fvwm_rc=@fvwm_rc@
 fvwm_name=@fvwm_name@
-fvwm_dir=${prefix}/lib/X11/${fvwm_name}
+fvwm_dir=${DESTDIR}/@libdir@/X11/${fvwm_name}
 
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
diff -rNu fvwm95-2.0.43f.orig/sample.fvwmrc/system.fvwm95rc.in fvwm95-2.0.43f/sample.fvwmrc/system.fvwm95rc.in
--- fvwm95-2.0.43f.orig/sample.fvwmrc/system.fvwm95rc.in	2014-04-12 15:07:09.692172200 +0200
+++ fvwm95-2.0.43f/sample.fvwmrc/system.fvwm95rc.in	2014-04-17 00:40:54.707217752 +0200
@@ -113,9 +113,9 @@
 # These paths are colon-separated lists, just like regular unix PATH
 #=============================================================================#
 
-ModulePath @prefix@/lib/X11/fvwm95/
-PixmapPath @prefix@/lib/X11/pixmaps/
-IconPath   @prefix@/lib/X11/mini-icons/
+ModulePath @libdir@/X11/fvwm95/
+PixmapPath @libdir@/X11/pixmaps/
+IconPath   @libdir@/X11/mini-icons/
 
 #=============================================================================#
 # Set the decoration styles and window options
@@ -572,7 +572,7 @@
 DestroyMenu "Documents"
 AddToMenu "Documents" \
   "FVWM95%mini.win95.xpm%"		Exec netscape \
-					@prefix@/lib/X11/fvwm95/index.html
+					@libdir@/X11/fvwm95/index.html
 
 
 #------------------------------------------------------------------------------
@@ -1147,7 +1147,7 @@
 #------------------ FvwmScript
 #------------------------------------------------------------------------------
 
-*FvwmScriptPath @prefix@/lib/X11/fvwm95/scripts
+*FvwmScriptPath @libdir@/X11/fvwm95/scripts
 
        
 #-------------------------------------------------------------------------------
@@ -1181,7 +1181,7 @@
 
 # Now the goodies....
 
-*FvwmTaskBarGoodyLoadablePlugins @prefix@/lib/X11/fvwm95/plugins
+*FvwmTaskBarGoodyLoadablePlugins @libdir@/X11/fvwm95/plugins
 *FvwmTaskBarGoodyLoadableQuiet
 
 # Modem
@@ -1231,7 +1231,7 @@
 # Battery Status
 #*FvwmTaskBarGoodyLoadableSymbol BatStatModuleSymbol
 #*FvwmTaskBarGoodyLoadableId BatStat
-#*FvwmTaskBarModuleIconPathBatStat @prefix@/lib/X11/mini-icons/
+#*FvwmTaskBarModuleIconPathBatStat @libdir@/X11/mini-icons/
 
 #------------------------------------------------------------------------------
 #------------------ FvwmWinList
diff -rNu fvwm95-2.0.43f.orig/utils/Makefile.in fvwm95-2.0.43f/utils/Makefile.in
--- fvwm95-2.0.43f.orig/utils/Makefile.in	2014-04-12 15:07:09.693172161 +0200
+++ fvwm95-2.0.43f/utils/Makefile.in	2014-04-17 00:40:54.717217752 +0200
@@ -5,7 +5,7 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 fvwm_name=@fvwm_name@
diff -rNu fvwm95-2.0.43f.orig/xpmroot/Makefile.in fvwm95-2.0.43f/xpmroot/Makefile.in
--- fvwm95-2.0.43f.orig/xpmroot/Makefile.in	2014-04-12 15:07:09.694172121 +0200
+++ fvwm95-2.0.43f/xpmroot/Makefile.in	2014-04-17 00:40:54.730217752 +0200
@@ -5,13 +5,13 @@
 
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@
-prefix=@prefix@
+prefix=${DESTDIR}/@prefix@
 exec_prefix=@exec_prefix@
 bin_dir=@exec_prefix@/bin
 x_includes=@x_includes@
 x_libraries=@x_libraries@
 
-man_dir=@prefix@/man/man1
+man_dir=${DESTDIR}/@prefix@/man/man1
 
 XPM_LIBRARY=-lXpm
 X_LIBRARY=-lX11 @LIBS@
